Fix gtk3-demo Visual Studio projects

Since we are linking in the resource items by the source, we need to
disable WholeProgramOptimization so that the resource stuff does get linked
into the demo binaries, so that they can be loaded properly.

Also make sure that gtk3-demo-application is also built with the multibyte
character set, like the rest.

This should fix bug 694342, at least for Visual Studio builds.

diff --git a/build/win32/vs10/gtk3-demo-application.vcxproj b/build/win32/vs10/gtk3-demo-application.vcxproj
index 5550650e5f76d5aa2cda1e21a5b9ff681d46bb51..c48d14b46267f22eba0f744aea86cb89cd23eb2f 100644 (file)
--- a/build/win32/vs10/gtk3-demo-application.vcxproj
+++ b/build/win32/vs10/gtk3-demo-application.vcxproj
@@ -26,21 +26,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>false</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>false</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
@@ -92,7 +92,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
@@ -136,7 +136,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r

diff --git a/build/win32/vs10/gtk3-demo.vcxproj b/build/win32/vs10/gtk3-demo.vcxproj
index 86839f0eeccba490781f023e2c1266e5febddac0..4e227204e9740648c6fe2c151a39fa5187692e2c 100644 (file)
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -38,7 +38,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -135,6 +135,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -158,6 +159,7 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

diff --git a/build/win32/vs9/gtk3-demo-application.vcproj b/build/win32/vs9/gtk3-demo-application.vcproj
index f6ba10a73b8e89a239923dde29d072d2c8f19af2..51b90ead6ec71258cb11ab8d52c7a7ead4ffc8cc 100644 (file)
--- a/build/win32/vs9/gtk3-demo-application.vcproj
+++ b/build/win32/vs9/gtk3-demo-application.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -51,8 +51,8 @@
                        Name="Release|Win32"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="0"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -82,7 +82,7 @@
                        Name="Debug|x64"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
+                       CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCMIDLTool"\r
@@ -111,8 +111,8 @@
                        Name="Release|x64"\r
                        InheritedPropertySheets=".\gtk+.vsprops"\r
                        ConfigurationType="1"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="0"\r
                        >\r
                        <Tool\r
                                Name="VCMIDLTool"\r

diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index 1b01ea3103d4280f860b7b8724276d703fde5cca..c2509da8d1e17dc4ba82bf3470e5404b0d949619 100644 (file)
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -90,7 +90,7 @@
                        ConfigurationType="1"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -123,7 +123,7 @@
                        ConfigurationType="1"
                        InheritedPropertySheets=".\gtk+.vsprops"
                        CharacterSet="2"
-                       WholeProgramOptimization="1"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"